From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 22 Feb 2007 23:15:08 +0000 (+0000)
Subject: * w32menu.c (Fx_popup_menu): Don't free menu strings here.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~30222
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=563cd4c00818b4f1ec03ecdeba468c55ef32b89c;p=emacs.git

* w32menu.c (Fx_popup_menu): Don't free menu strings here.
(w32_menu_show): Do it here instead.
---

diff --git a/src/w32menu.c b/src/w32menu.c
index b977b90e52d..a0aef4b58dd 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -835,7 +835,6 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
-  w32_free_menu_strings (FRAME_W32_WINDOW (f));
 
 #endif /* HAVE_MENUS */
 
@@ -1936,6 +1935,9 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
 
   DestroyMenu (menu);
 
+  /* Free the owner-drawn and help-echo menu strings.  */
+  w32_free_menu_strings (FRAME_W32_WINDOW (f));
+
   /* Find the selected item, and its pane, to return
      the proper value.  */
   if (menu_item_selection != 0)